Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

[HTTPS Everywhere] simplify ruleset pattern for HTTPSE 6.0 #13133

Merged
merged 1 commit into from
Feb 16, 2018

Conversation

diracdeltas
Copy link
Member

@diracdeltas diracdeltas commented Feb 14, 2018

Requires brave/https-everywhere-builder#3
Fix #11598

Note that this is a breaking change from HTTPS Everywhere 5.x's ruleset
format. This should not be merged until brave/https-everywhere-builder#3 has been merged and had a prod release uploaded to S3.

Test Plan:

  1. Build HTTPS Everywhere following the instructions in https-everywhere-builder with Work around with HTTPSE breaking ruleset format changes https-everywhere-builder#3 included
  2. Copy out/httpse.json to your APPDATA director
  3. Start Brave with HTTPS Everywhere enabled
  4. Go to http://www.haproxy.org/. It should be upgraded to HTTPS
  5. Go to http://www.thompsonhotels.com/. Images should appear on the site.
  6. Go to https://https-everywhere.badssl.com/. Under shields, it should show 1 HTTPS upgrade.

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed. (Ask a Brave employee to help if you cannot access this document.)

Reviewer Checklist:

  • Request a security/privacy review as needed if one was not already requested.

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

Needed for brave/https-everywhere-builder#3

Note that this is a breaking change from HTTPS Everywhere 5.x's ruleset
format.
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test plan works perfectly! 😄 (new rules had been pushed to prod last nite)

@bsclifton bsclifton merged commit 9c4159a into master Feb 16, 2018
@bsclifton bsclifton deleted the feature/httpse-6.0 branch February 16, 2018 16:47
bsclifton added a commit that referenced this pull request Feb 16, 2018
[HTTPS Everywhere] simplify ruleset pattern for HTTPSE 6.0
bsclifton added a commit that referenced this pull request Feb 16, 2018
[HTTPS Everywhere] simplify ruleset pattern for HTTPSE 6.0
@bsclifton
Copy link
Member

master 9c4159a
0.22.x 96b788f
0.21.x 4aebee3

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants